Convert to follow PHP-FIG

Closes #16