Some cleanup of interface and names.