edited coding style