Improved the switch conditional selection and removed the Number::Integer and Number::Float modules.