Minor changes cleaning up code.