Refactored constants to static class