Tightened up code a bit