Clean Up formating