further simplification of constructor, made new build