:lipstick: refactoring