removed whitespace
Renamed variables to common style