Cleaned code up a bit

Removed unnecessary pointers, and made them link from Team2530