Cleaned up naming and placement of some UISwitch code