front: Minor code simplification, some auto-formatting.