A tiny refactor and style tweaks.