replaced if else with switch case
Merge branch 'feature/export' of github.com:atomic-component-engine/ace into feature/export