reformatting and minor updates

reformatting to fix phpcs