and even more code clean-up