cleanup, directives internal rearrangement ...