tidy-up and reuse helpers