Complete descriptions and cleanup code