Improve indentation and fix IndentAllFile to don't use marks