:lipstick: Refactoring.