cleaning up the markup