minor cleanup and testing