Simplify things down quite a bit