yet another little code improvement