refactor

git-svn-id: http://svn.code.sf.net/p/marvinproject/code/dev@114 ccb5e5b0-b481-49e6-8c11-d5b444fbd5f0