Change indent and comments to a more readable style