no need to cache builder, and comments cleanup