fixing things from code reviews