Fully implement Gabe's suggestions instead of not

i'm a big idiot whom forgets to stop returning arrays I no longer use