Final commit prior to testing

Reformated syntax, condensed some code, renamed  dropChance() method to fix mistake