Renamed undescored names
Fixed event listener
Updated README