minor cleanup in tools.makers
refactored tools.makers. all passing