Made sure some more pointers are initialized to null and changed some of the spacing style