Just tightening up code.