Removed unused code and fixed comments
Fixed comments