Super nice cleanup!