Have updated some of the classes to be a bit cleaner and more succinct as far as their logic goes.