source cleanup a bit