Further cleanups of code