tightening up the code.