refactor for justice