Just a little bit of code cleanup