Tidying code a bit to spam console less