Homework Assignment 7

Minor code clean up and maintenance.