extremely small refactorings

Very small refactorings and few code annotations.
They are preparations for heavier and deeper code changes, with more performances impacts.