a bit of a cleanup