Code cleanups

Just some code cleanups