Reorganized some of the comments in master.py