some linting issues fixed