Tightens up code a tad