Style cleanup
Hapi 8.0.0-rc5