Cleaned up method names, events.