Refactoring event building range