Various cleanup, indentation, deletion of unused parameters etc. No change in results