Suggested readability improvements.
Revert the mixed string/variables line.
Merge pull request #1 from DrewAPicture/cleanup

Align and make translatable all the things.