Cleaned up switch control class