Use new-style string formatting
Align things correctly