Change range constraint setup methods to be private
Add further TODO notes to clean up code