Reduce the complexity of the code
Merge pull request #37 from PressLabs/develop

Reduce the complexity of the code