Code review applied