cleanup: avoid repetitions