[spankwire] Improve and modernize