Refactored init file