Small part of refactoring
Timer's bugs fixed