Fixing a bug with naming, moving things around
Edited unused code, quick fix mostly for sanity