style(directives): some code cleanup, clarification & simplification