Updated classes
Cleaned code involving pointers