bit of code cleanup