Cleanup and minor standardization.