More code clean-up