:lipstick: Extra white-space and simplification