Cosmetic cleanups, switching queue methods to pointers