Coding style modified