Cleaned up copy