Comments and cleaning up in the code.