some cleaning up and format