Feat/updated comments