Fix whitespace
Fix inconsistent variable naming style