Clean up some comments and whatnot