Update code formatting

Fixes based on CodeSniffer checks