Added comments in required places