fixing and standardizing