Removed unnecessary overrie per code review
Changes to make jslint happy (well, almost)
Make jslint (almost) happy