refactored out every unnecessary const_