few changes in code style