ENYO-2344: cleanups

- Move private functions in functional scope
- Various white-spaces cleanups

Enyo-DCO-1.1-Signed-off-by: Francois-Xavier KOWALSKI <francois-xavier.kowalski@hp.com>