few changes in code appearance