Cleanup from review