Just tidying things up a bit for my preference