* refactoring introducing #13