rename events to be more clear and clean up a little