Misc PEP8 fixes

However, in most of the cases where we use classes, we comply with PEP8 and have the extra line.