Cleaning up markups