[spike] Modernize