tightened up the code a bit.