cleaned up code
further code diet
even further code slimming/readablity