Trivial code cleanup