lots of little code cleanups