String formatting and variable cleanup

Extra `quotes =` was hanging around for some reason.

Fixed the string formatting so it matches the rest of the code.
Merge pull request #29 from richierichrawr/master

String formatting and variable cleanup