prevent double method call
better object-finder method
simplify code
renaming internal method