Minor cleanup of design.