Big ugly commit due to tidyfying everything yay