Made changes for camel case instead of underlines in naming convention
Moved events to bind function