cleaning up some markup