Update configuration files

Remove trailing whitespaces.
Reorder files params.