Cleanup in response to review