Make bit more PEP8 compatible, minor ammendments