KGerring/spinach code health