Simplify range

Been playing with this, seems solid