cleaned this up