Fix some nasty string formatting

Just a little cleanup