Enhanced and added comments