* clean things up a bit...