Change to a bit more compact code.