Merge pull request #51 from pocket-gophers-2014/refactoring

Refactoring