Decompose Methods into Traits

Inline with part of #95, it may be useful to break functionality into smaller Traits so classes can be a little more focused and easier to navigate. Don't go overboard, if there's any kind of conflict resolution between traits that's a big code smell, but definitely keep this in mind as we refactor/develop 4.0.0