Indentation and simplification