Use dict comprehension, remove pylint comments