Applied updated coding style