Some cleanup
Clean up and add some clarification