:lipstick: Make code easier to read