Made sure constructors align correctly