Clean up whitespace-related lint:files warnings
Fix variable name