#3857: some refactoring

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@30177 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Ticket #3174: this change is not important, but nicer if this is here (already in the patch to be ported into 4.4)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@30178 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e