doctus version as variable
some refactoring