refactoring and cleaning up


git-svn-id: https://ilk.uvt.nl/svn/sources/Frog/trunk@17658 12f355fe-0486-481a-ad91-c297ab22b4e3