Fix non-void return warning, and format.