cleaned up a bit, minor changes