A little more simplification
More simplification