Refactoring attempts by Tom den Braber & Michel Kraaijeveld#8

Open

LandDragoon wants to merge 1 commit intodelftsre:masterfrom

LandDragoon:rebase

Commits on Apr 10, 2016

refactored switch statements and moved code blokcs to seperate functions
Michel
committed