Cleanup

Cleaned up useless references.  Minor code cleanup and additional
comments.