Minor cleanup and clarify language