Minor changes in code style