Use proposed coding style