Deprecation problem & pep8

Nekaj malenkosti v zvezi s pep8 in en deprecation warning.