Minor clean ups for the box and epuck entities