[pep8] N801 compliant
[pep8] N801 compliant
[pep8] N802 compliant
Merge pull request #31 from Astalaseven/n801

N801, N802 & N804 compliant