Updated comments
Removed the callbacks
Improved descriptions