Refactor for proper translation output range