Some cleanup and clarification