1. Req 6 finished; 2. Cleaned up some comments