Tiny code clean-up