general cleanup and standardization