Some code cleanup.
Use .format() instead of "%" to print strings with vars.
Merge pull request #4 from ikarus23/code_cleanup

Some code cleanup.