Code review first iteration