Issue #528 make lint clean