removed pointers as much as possible