More minor code cleanups.
Rename some utility methods and cleaned up clone methods.
Merge pull request #7 from rorygraves/master

More minor code cleanups.