Tightening the code a bit.