Minor changes in code