More simplification of the code.