refactored usings