cleaning up the constructors