uniformed the code