01.08.14 minor refactoring