Qotd refactor