Refactored utilities for spec