cleaned up some markup