syntax refactor to match https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md