Refactoring usings, some names and code