Small comment update
Comment fix and removed an unused method
Refactoring changes