Cleanup/reformatting
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Added missing "import Type"
Merge branch 'master' of https://github.com/cwi-swat/rascal.git