Refactor: arrange