fixed several lint problems