* Inline const values in samples where used only once * Fix some spacing issues and use consistent ordering of settings/params