refactored switch wrappers, added new wrapper for bool values