all tests passed; a little cleaner