Refactor for conformity