General housekeeping update, cleaning up code and such. Took me way longer than it should've bc I was sick for half of the time I was working on it lol