more description and cleanup