Reducing complexity
Merge pull request #21 from Catharz/reducing_complexity

Reducing complexity