Little bit more simplification