python template clean-ups, pylint