more refactoring fixes for supervisord