Refactor usings