Dev

two else ifs and no else is kind of a code smell for me. I would rework these conditionals.