Fixed the lint problems