simplify things a little