Pendantic cleanup