Follow the new coding style