Let's refactor :)