Post Sprint

Refactoring of classes. Taken out unnecessary code. Added in relevant
comments and refactored each class to the Code Style Guidelines for
Contributors.