Got rid of one unnecessary constructor