Little bit of code clean-up