refactor and today's results