Refactor :frog: