Changing to .format() string formating, trying to improve code
legibility a little bit
Just one format missing
Merge pull request #2 from iferminm/development

Code legibility