cleaned up a little cruft