Little code clean-up