Some cleanup :pray: