Cleaned Up Switch