Cleaning up comments, organizing includes.