Linting and internal change. Minor api changes