Refactor parameters order