fixed few small things from code review