Nitpick: Could we use our updated coding standards here ?