Added some slight changes to clean up the component directive.