Bit of code tightening