fixed formatting inconsistencies
removed debug stuff
more formatting tweaks