More coding style consistency