Cleanup in response to review comments