Since there's only one step in this scenario, it's safe to get rid of this conditional (and the one on line 48), isn't it?