Huge init file refactor