Quick refactor of everything