Changing imports and refactoring methods