applied new coding style