gratuitous code cleanup