OCSADV-27 A few small refactorings