Cleanup, formating