Disabled indexing at startup
Some cosmetic changes