ENH: PEP257 style + small code simplication