Remove redundant elif checks

Per @Naddiseo suggestion, a cleaner solution