Cleaned up copy and markup