refactor the usings