CLEANUP: small code cleanup