formating/cleaning up