Cleaned up switches