major refactoring, cleaning, and unclutterfying

I can’t even