Cleaning up markup