source code cleanups