Minor changes

Refactoring GiantSwitch