Cleaning Imports and renaming methods