trivial: small modifications