More coding style