adds more code clean-up