consolidated builders and helpers into common_tools