Tightening up the code...