Used new coding style