First pass at PEP8 and other cosmetics
Merge branch 'develop' into pep8
Fixing incorrect using of interpolation
Fixing failing test: To fix: we should not expect empty strings at all.