Consolidate steps