Cleaning up Rule interfaces