some form of formatting
more formatting
removing reference to old constructors