Few more adjustments and added comments