Indentation and some content changes