Neatness
Minor cleanup