Cleanup from code review