Refactor for additional simplicity