Removed ifs from marcher