Format consistently; fix equipment removal