Minor clean up to source code