Simplifying builders
Small code amelioration