Refacter some pet elements as swim elements