clean it up a little more