added some notes
removed unused import
Refactoring