Refactor code styling

Hi!

This PR follows ageoldpun's commit and includes his changes. It removes unnecessary self. calls in the event model.