Cleaned up switch in wifly