Updated tool-template and done some cleanup