Made code a little tighter
Tightened up code