Some change in code style