cleanup and make all one directive