basic cleanup: tabs, stray message variabel