#67 small refactoring (more!!!)