fixing lint errors except one issue that I am not sure how to salvage