Avoid using stupid 'new' operation. Simplify logic.