:lipstick: Clean up