Improved overall code style
Simplified inRange / isBetween methods