lint support

Implemented better lint support