FIX code review issues