Class Programming Assignment OOP 2014-10-21

Clean up and maintenance.