Refactoring for builder with na little nicer API. Removing minification code, should be handled by user.