added descriptions and cleanup