Updating, reformatting and optimizing ToolLib