Cleanup and clarification.