Simplify things a little