Handling events more elegantly