US804 - Implement code review comments