Typo
More DRY
Added some directives