Appeasing codeclimate.com

* Removing duplication of method body
* Extracting smaller methods from larger method
Merge pull request #36 from projecthydra-labs/appeasing-code-climate

Reducing duplication of messages