Cleaning up code.
2.1.6