Try to implement an idea
Hugh code clean-up