FIX comments raised at code review