front: Minor simplification and some auto-formatting.