sort use statements + refactor