Minor cleanup and standardization