Got rid of unnecessary constructor