Refactoring - extracting constants