Added new tool and code clean up