An attempt at cleaing up a bit