Commit 1
Smell = Duplicated Code

Examined all classes for duplicated code and removed duplicated code.
Primarily fixing the constructors to use the the "this" keyword.