Update code formatting

Changes suggested by CodeSniffer.