Bit of code tidying