Removed old commented code
Added 'default' case in match switch-case