Refactor

Submitting a slight refactor of some of the class/method structures. (Also so that code climate jumps up :wink:)