Fixing lint

Pull request to pass the linting rules that we setup in gaia