Refactor to match existing conventions