Clean up some comments and make things more streamlined