tiny cluster refactor