Fixing some linting issues