More efficient checking of set points against ranges
Range structure introduced
Variable renaming
Remove unused header includes