Cleaned up directives