Commit for Matt Smith - cleaned-up ready eventListener