Refactor for consistency