Got rid of all the silly public members