Refactor initialize arguments