Some minor simplification