Bit of code clean up I guess