bit of cleanup stuff