67567950 code cleanup

@nthomson - directive prefixes!