Remove some visual clutter
Fix bad indentation