FIX comments raised during code review