[TASK] Small issues during formal code review