Update based on feedback from code reviews