couple of small updates to make code nicer