FIX comments raised in code review