Changes from long types to short ones

* Removes some empty lines
* Adds default values
3 jobs for fixing-terfe2-models-cgl in 1 minute and 27 seconds (queued for 3 seconds)