Refactoring; Objects outline and select events