Corrected comments
Removed unnecessary code