silverware: old logic should lose to new logic, cleaning up new logic formatting