Clean up step numbering