Cleans up markup