Cleanup from code review comments