refactoring - static to const