Refactor initialize to call fix