Minor cleanup and formatting