Move the old indentation code to a separate file