A few QOL changes. Mostly just deleted test functions and reflowed spell names to a function