Style cleanup
Add support for multi-process