Removed unused import and reorganised the file.