Refactored inits