More utility code
Cleanup to more functional style.
Updated.
Updates.