Cleaned up the markup.