Style, layout, and repositioning

Looks better
Use snake_case for variables.