Ditto comment about dropping this conditional (your choice though, not a blocker)