cleaning up a bit...