improving performance by getting rid of Hashi::Mash and therefore method_missing?.  also refactoring code