[TASK] Included code review comments