Updated description and minor cleanup