cleaned up a bit.