refactor for composer standards