Simplification of the previous commit