cleanup a bit...