Make this a bit nicer