Reordered switches of mathoperations too