Small refactoring of today code