Cleaned up markup.