some refactoring, static class for consts added