Refactoring to simplify
Add private constructor to static class