Added missing event subscription

- Also prettified switch case with {}