Refactor Elevator