Organized Imports and Refactored Code