Minor cleanup and revision