Bit of code maintenance