lot of stuff
removed tabs
cleaned up
more