feinCMS 1.7 fix, some PEP8 fixes