further cleanup and orginization