Minor cleanup; interface is well defined as is for Rules