Cleanup from code reviews