Cleaned up utilities.