Minor syntax improvement in code, which now is even shorter