cleanup: use references