Fixed: tool not destroyed when used.
Code cleanup + javadoc