Updated description and clean up