Clean up some comments used for testing and add comments for clarity