Improved and added comments