[enhancement] directive working #58
clean up