THANK YOU for refactoring Constants