Bit of code clean up