Fastfix: removing old if-else