cleaned up utils