Reorganization of the markup.