cleaned up a bit;