Bit more simplification