Bit of code cleanup