General refactor, removes prototype extension as module has been updated.