Remove trailing whitespace
Fix variable names