Feature/refactor initialize action