Fix string formatting, spaces and some style

This looks great, and is a great approach to the problem, very nice!