Simplify internals a bit