Formating cleanup
Enable rpcinterface:supervisor due to funky namespace strategies.