style: fix whitespace issues

Closes #8277