Formatting changes

Try to make the formatting consistant, also remove the arrays in the directive
calls that are not needed.
Add missing ;