Fix some pylint warnings

Fixed some easy pylint warnings (W1202 and W1608)