misc cleanups
more cleanups
formatting, "bugs" was hard to read