Minor clean up of constructor
Merge from origin