Refactor from today's exercises