yet another clean up