Fixed some little things to satisfy pylint