Comments in package forms and some PEP8 fixes.