[CODEREVIEW] Sprint 3 third part of code review