Cleaned up formatting, removed extraneous comments, reformatted comments that should stay so that they don't present errors in PyCharm.