updated description and cleanup