removing-elif-part2

All the elif statements are gone - hooray!