Complete descriptions and clean up code