Finished Round2...cleaned up some of the util functions