Cleaning up some comments and functions