Some simplification of previous commit
1 file changed