Tidier commit of spnhyh