Code cleanup (pylint 10/10 ;0)