[CODEREVIEW] Sprint 3 second part of code review