Consolidated code indenting, much important