finished delete and some better formating