pylint refactor

Rewrite vars, function names and other problems found by pylint