remove ugly tabs
doubles everywhere
misc, minor code cleanups