More cleaning, getting back to that new-code smell

Fixed tabs
Removed another unnecessary section