consolidate shapes utils