Ma small refactor

WIP: thinking about how to break up this class. 
Started with breaking large methods down into smaller methods.
http://www.ruby-doc.org/core-1.9.3/Hash.html#method-i-fetch