Fix&edit code