quick clean up and minor change, need something more creative and to flesh it out a bit.