Clean-up executor code
Fix serializability
textwidth fix