Minor bug fixes and code condensing

Quick patch

Fixed a bunch of redundant code and removed anything that isn't used in order to make everything cleaner. This is by no means completed- over the course of several updates, I'll slowly clean everything up.