Comments as refactoring hints and much reindenting