code reviwe fixes