Refactoring for second directive done