draft clock refactoring