some cleanup for spiral

Signed-off-by: slofmb <loizoustephanos@gmail.com>