some clean up and formatting
added misc