+ cleanup a bit