Wee bit of code cleanup