Bunch of cleanup and comments