Removed old imports and formatted code