Just Tightening up some code