Simplifications on the code.