Made some non-major changes to the code.