EVERYTHING IS SO ARBITRARY NOW. Also a little cleanup