Just a tiny bit of code cleanup