Resolved Merge Conflict - cleaned code once again
:octocat:
Resolved merge conflict, cleaned code, added comments, did a metric
shitton of work, ...
Congratz @ tobias, you broke it once again :octocat: