More minor code cleanups.

Rename some utility methods and cleaned up clone methods.