Fixed some linting issue