cleaned up a little more