Cleanup
[Refactoring] Simplify tool property code workflow.

It's a big change, uh? code is much more clear and shorter.