Cleanup minor issues from pylint