updates from code reviews