Move indentation helper to mapping section