Fix comment
Tweak layout, better variable names