bit of a cleanup