:lipstick: Clean up based on feedback