cleanup: use better defaults code