Cleanup and clarification