MINOR/STYLE: the old way is more readable