Comment things and clean up a little