[FOLD] Changes based on code review