Remove blank line
Clean up names
Align assignment operators