Removed unused and added comments