clean me

Code cleanups