Bit of code cleaning