Simplification of code.