Code simplification, step 1.
Code simplification: step 2.