fixed issues  found on code review session