fix constructor name
use named constructors throughout