Fixed reveiew comments