Updated today's tasks and refactored more