Source code cleanups