Utilities Cleanup

Small changes and cleanup to the utilities class.