Bunch of cleanups