utils cleaned up and comments updated.