Got rid of pointers