Cleaned some constructors