Tiny style/code cleanup