GSF: tidy/format the code

Following quite a few (>>10 ) MR and in preparation for more re-factoring / improvements format / tidy a bit the code

This is relative large but mainly indentation making things consistent.