Indenter: cleanup and refactoring