refactoring match controller
fix clock time reset()