[TASK] Improves/corrects code comments