Small code pep8 changes.
Code cleanup. No real changes.
Fix test.
Merge pull request #28 from lizardsystem/roland-popup

Small code cleanup en fixed unittests