Cupcake upgrades

[placeholder until merge-ready]
Not a big deal, but I find comments above the line they refer to to be more readable (and an empty line above them). Using vertical space can be great for readability