pep8 fix, fixed call of static methods, renamed var. x