Code improvements for the indexer API handler and a few code cleanups as well.