chore(Directive): clean up code for clarity/style.