Bugfix

Added new switch breaks, removed some white space