Cleaned up directives. Relates to #4