cleaner events
small refactor in view