also tidy up formatting with vs tools
also fixes some warnings about culture-specific string comparisons