Better variable management and pylint'ed