#4 remove stupid if else statement