added tabs, cleanup