A little more cleaned up