Various cleanup: Deletion of unused parameters, indentation, etc.