makes some code cleanups