PEP8 & PEP257 improvements