#17 fix timer * small refactoring