Simplify scale clipping logic, remove redundant if statements