Refactorings and changing times
cleaner should_reply logic