Simplify methods by decomposing them, and use really explicit method names
Merge pull request #1 from kerrizor/refactor-complexity

Simplify methods by decomposing them, and use really explicit method names