consolidated lines and changed all %r/%d to %s's

no need to use %r or %d, in python %s works for everything