[CLEANUP] Cleanup comprehensibility - scrutinizer feedback
Merge pull request #9 from tomasnorre/scruntinizer/comprehensibility

[CLEANUP] Cleanup comprehensibility - scrutinizer feedback