refactoring; remove unnecessary consts