cleaned this up a little