Refactored height and weight mapper