Minor PEP8 and PEP257 changes