More clean up

Too much time spent putting in things quickly. And I like clean code,
code appearance is as much to to with easy reading and it is with
professional pride. KEEP CODE CLEAN!