removed bullshit
replaced old implementation with new version, prompted by reddit comments :)