Fixed the constructors according to the instructions