Refactored switch cell