Refactored code to static initializers for the classes.