Directive improvements

Not really sure why the directive did so much when all we really want it to do is parse and format. Changed the directive to do just that.