unused import removed
extended comment and removed unused code