Cleanup and standardize