Clean up

code cleanups