more code clean-up