Refactoring to try to reduce amount of mandatory initializations