PEP8 fixes
access to class attributes through the instance reference rather than statically