some cleanup and simplification of type signatures for client code
test cleanup