introduce helper method to reduce code duplication
introduce helper method to reduce code duplication
introduce helper method to reduce code duplication
code refactoring to simplify methods
code refactoring to simplify methods
Merge pull request #38 from movitto/code-cleanup1

Code cleanup for code climate