Cleaning up misc comments and some minor renaming