Refactoring of the toolkit after meeting with Javascript Experts from TW-POA-Office.