Cleaned this up