Full code review

This is not conforming with the comment above the function.