cleaned up utilities