a bit of cleanup for the previous commit