little tweaks, cleanups, tab fixing, eliminating comments