"reworked context and added comments"