Cleaning up markup.