Added comments to the file header
Clean up of switcher activity