Cleanup and standardization