Organize shared steps