Refactored height