removed long-ass else statement