remove feature switch (given..when) to if..elsif..else