cleanup + formating