Cleaning-up indentation